[XM-TEST] vTPM test changes

Remove an uninitialized variable.
For some reason the 'ps aux' command does not see the process anymore
(since some time on the weekend). Need to add 'COLUMNS=n'.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>

diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
index 6de28805d3ad48992d327a11de14f56997671767..15775801f64b801ddca08909bde7a167b40d4475 100644 (file)
--- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
+++ b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
@@ -91,7 +91,7 @@ if vtpm_uuid not in vm_vtpms:
 try:
     console = domain.start()
 except DomainError, e:
-    FAIL("Unable to create domain (%s)" % domName)
+    FAIL("Unable to create domain (%s)")
 
 try:
     console.sendInput("input")

diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py
index 0af46574c9372a877b9252113ed6dc3750c53ed7..da65aab5fb24154f8e7746be5ff5822ef992fddf 100644 (file)
--- a/tools/xm-test/tests/vtpm/vtpm_utils.py
+++ b/tools/xm-test/tests/vtpm/vtpm_utils.py
@@ -8,7 +8,8 @@ from XmTestLib import *
 if ENABLE_HVM_SUPPORT:
     SKIP("vtpm tests not supported for HVM domains")
 
-status, output = traceCommand("ps aux | grep vtpm_manager | grep -v grep")
+status, output = traceCommand("COLUMNS=200 ; "
+                              "ps aux | grep vtpm_manager | grep -v grep")
 if output == "":
     SKIP("virtual TPM manager must be started to run this test; might "
          "need /dev/tpm0")